Skip to content

Merge main#1

Open
FilPag wants to merge 1450 commits intoFilPag:mainfrom
Balatro-Multiplayer:main
Open

Merge main#1
FilPag wants to merge 1450 commits intoFilPag:mainfrom
Balatro-Multiplayer:main

Conversation

@FilPag
Copy link
Copy Markdown
Owner

@FilPag FilPag commented Aug 5, 2025

No description provided.

FilPag pushed a commit that referenced this pull request Aug 11, 2025
Moved logging of seed to the end of the game instead of the start
FilPag pushed a commit that referenced this pull request Sep 11, 2025
Moved logging of seed to the end of the game instead of the start
V-rtualized and others added 24 commits September 15, 2025 11:54
Translate new decks, stakes and the Giga Standard Pack into polish.
Remove backwards compatibility `guestReady` hack for old server in action_lobbyInfo function
Change override of blind_choice_handler function to lovely patch
mp_include and bugfix gradient
Fix incorrect colon call in reconnect function
Fix incorrect colon call in reconnect function
stephenkirk and others added 30 commits March 1, 2026 13:13
Decks without a sticker_x_pos entry (e.g. Echo) crashed the cocktail
sticker draw step with a nil sprite position. Gate get_cocktail_decks
on sticker_x_pos membership and move the table above the function so
it's in scope.
Echo Deck working with calculator + sticker for cocktail
Allows overriding MP.EXPERIMENTAL values via a gitignored .env file
instead of editing core.lua directly. Includes .env.example as template.
Bypass the SMODS calculate machinery entirely — the ease_dollars
wrapper now finds hoarder cards directly and bumps their sell value
inline, instead of firing a custom EC_ease_dollars context through
eval_card. Removes hoarder's calculate function.
Echo Deck working with calculator + sticker for cocktail
Fix save: guard save_run when G.F_NO_SAVING is set
This is how you fix the seltzer crash for real for real
Update JokerDisplay compatability
…sizing

Fix connection message position when resizing the window
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.